From 22ceff32c8a798068766bc14afd75840578fce1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 11 Dec 2025 08:22:41 +0200 Subject: [PATCH] MDEV-38289: innodb.log_corruption_recovery sporadically fails When the test is starting up the server with innodb_force_recovery=1, there will be messages about the LSN being in the future. The current LSN is expected to be 12338 plus any number of FILE_CHECKPOINT records (16 bytes each). We have observed anything up to 12402=12338+16*4 in our CI systems. To be on the safe side, let us allow up to ten records. Origin: https://github.com/MariaDB/server/commit/4ee491f1b2eb356e9dc40f388f79b62cfeb13609 Gbp-Pq: Name MDEV-38289-innodb.log_corruption_recovery-failed-sporadically.patch --- mysql-test/suite/innodb/r/log_corruption_recovery.result | 2 +- mysql-test/suite/innodb/t/log_corruption_recovery.test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/innodb/r/log_corruption_recovery.result b/mysql-test/suite/innodb/r/log_corruption_recovery.result index 8d44df0b2..54bbe092f 100644 --- a/mysql-test/suite/innodb/r/log_corruption_recovery.result +++ b/mysql-test/suite/innodb/r/log_corruption_recovery.result @@ -5,7 +5,7 @@ call mtr.add_suppression("InnoDB: OPT_PAGE_CHECKSUM mismatch on \\[page id: spac call mtr.add_suppression("InnoDB: Set innodb_force_recovery=1"); call mtr.add_suppression("InnoDB: Cannot apply log to \\[page id: space=127, page number=0\\] of corrupted file '.*test/t\\.ibd"); call mtr.add_suppression("(InnoDB: Plugin|Plugin 'InnoDB')"); -call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 123(38|54)\\."); +call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 12(3(38|54|70|86)|4(02|18|34|50|66|82|98))"); SET GLOBAL innodb_fast_shutdown=0; # restart SELECT * FROM INFORMATION_SCHEMA.ENGINES diff --git a/mysql-test/suite/innodb/t/log_corruption_recovery.test b/mysql-test/suite/innodb/t/log_corruption_recovery.test index 06069679e..489010f9b 100644 --- a/mysql-test/suite/innodb/t/log_corruption_recovery.test +++ b/mysql-test/suite/innodb/t/log_corruption_recovery.test @@ -14,8 +14,8 @@ call mtr.add_suppression("InnoDB: OPT_PAGE_CHECKSUM mismatch on \\[page id: spac call mtr.add_suppression("InnoDB: Set innodb_force_recovery=1"); call mtr.add_suppression("InnoDB: Cannot apply log to \\[page id: space=127, page number=0\\] of corrupted file '.*test/t\\.ibd"); call mtr.add_suppression("(InnoDB: Plugin|Plugin 'InnoDB')"); -call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 123(38|54)\\."); - +# Allow innodb_force_recovery=1 to write up to 10 FILE_CHECKPOINT records +call mtr.add_suppression("InnoDB: Page .* Current system log sequence number 12(3(38|54|70|86)|4(02|18|34|50|66|82|98))"); SET GLOBAL innodb_fast_shutdown=0; --source include/shutdown_mysqld.inc --move_file $DATADIR/ib_logfile0 $DATADIR/ib_logfile0.old -- 2.30.2